Merge remote branch 'origin/upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Thu, 22 Apr 2010 15:47:55 +0000 (17:47 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Thu, 22 Apr 2010 15:47:55 +0000 (17:47 +0200)
commit8a12e342f50872717d0299e7dd27e2c91b621d36
treede57d6f0982278f15f8696e49970206ae94a0bc8
parent6f159bdebe29119a40e10bfbab786df03e11d459
parent81beb8b4148eb8ea69d4c265c8d4a172d37fd6c7
Merge remote branch 'origin/upstream-cvs' into upstream